Many installer tweaks for Windows.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4091 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss
index 0dbc66f112f080845ede5f2b4971a5c24d6fbe92..1f726edc917982fdb3b296d7a660361491364f5a 100755 (executable)
--- a/gpsbabel/gui/setup.iss
+++ b/gpsbabel/gui/setup.iss
@@ -16,7 +16,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}\r
 AppName=GPSBabel\r
-AppVerName=GPSBabel 1.4.2\r
+AppVerName=GPSBabel 1.4.3-beta20110903\r
 AppPublisher=GPSBabel\r
 AppPublisherURL=http://www.gpsbabel.org\r
 AppSupportURL=http://www.gpsbabel.org\r
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
 DefaultDirName={pf}\GPSBabel\r
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
-OutputBaseFilename=GPSBabel-1.4.2-Setup\r
+OutputBaseFilename=GPSBabel-1.4.3-beta20110903-Setup\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r
@@ -37,12 +37,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
 \r
 [Files]\r
-Source: qtdir\bin\QtCore4.dll;         DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtGui4.dll;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtWebkit4.dll;       DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtXml4.dll;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\bin\QtNetwork4.dll;      DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\mingw\mingwm10.dll;      DestDir: "{app}"; Flags: ignoreversion \r
+; This isn't as wreckless as it seems; these directories are populated on a\r
+; controlled way by the batch file.\r
+Source: qtdir\bin\*.dll;       DestDir: "{app}"; Flags: ignoreversion \r
 Source: qtdir\plugins\*;               DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
@@ -51,36 +48,22 @@ Source: qt.conf;                            DestDir: "{app}"; Flags: ignoreversion
 Source: release\gpsbabelfe.exe;        DestDir: "{app}"; Flags: ignoreversion\r
 Source: release\libexpat.dll;          DestDir: "{app}"; Flags: ignoreversion\r
 Source: release\gpsbabel.exe;          DestDir: "{app}"; Flags: ignoreversion\r
-Source: release\help\*;                DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
+; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 ; Translation strings extracted from source code.  Include it in the dist\r
 ; so that users can translate if they want to. \r
-Source: gpsbabel_de.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_es.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_fr.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_hu.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabel_it.ts;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_de.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_es.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_fr.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_hu.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_it.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_ru.ts;              DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabel_*.ts;               DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabelfe_*.ts;             DestDir: "{app}\translations"; Flags: ignoreversion \r
 \r
 ; Compiled translation strings that are used at runtime.\r
-; Only Spanish is adequately translated for now.\r
-Source: gpsbabel_es.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_es.qm;              DestDir: "{app}\translations"; Flags: ignoreversion \r
-\r
-; German is usable\r
-Source: gpsbabel_de.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe_de.qm;              DestDir: "{app}\translations"; Flags: ignoreversion \r
+; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion \r
+Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
 \r
 ; Now translations from Qt's own UI stuff.\r
 Source: qtdir\translations\*;                  DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
 ; Miscellaneous\r
-Source: COPYING;                       DestDir: {app}; Flags: ignoreversion\r
+Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion\r
 ; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion\r
 ; Source: README.contrib;                      DestDir: {app}; Flags: ignoreversion\r
 ; Source: README.gui;                  DestDir: {app}; Flags: ignoreversion\r